rustc: Harmonize DefKind and DefPathData
#118573
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`DefPathData::(ClosureExpr,ImplTrait)` are renamed to match `DefKind::(Closure,OpaqueTy)`. `DefPathData::ImplTraitAssocTy` is replaced with `DefPathData::TypeNS(kw::Empty)` because both correspond to `DefKind::AssocTy`. It's possible that introducing `(DefKind,DefPathData)::AssocOpaqueTy` could be a better solution, but that would be a much more invasive change. Const generic parameters introduced for effects are moved from `DefPathData::TypeNS` to `DefPathData::ValueNS`, because constants are values. `DefPathData` is no longer passed to `create_def` functions to avoid redundancy.
|
r? @TaKO8Ki (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 4, 2023
Rollup of 5 pull requests Successful merges: - rust-lang#118495 (Restrict what symbols can be used in `#[diagnostic::on_unimplemented]` format strings) - rust-lang#118540 (codegen, miri: fix computing the offset of an unsized field in a packed struct) - rust-lang#118551 (more targeted errors when extern types end up in places they should not) - rust-lang#118573 (rustc: Harmonize `DefKind` and `DefPathData`) - rust-lang#118586 (Improve example in `slice::windows()` doc) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 4, 2023
Rollup merge of rust-lang#118573 - petrochenkov:pathdatakind, r=TaKO8Ki rustc: Harmonize `DefKind` and `DefPathData` Follow up to rust-lang#118188. `DefPathData::(ClosureExpr,ImplTrait)` are renamed to match `DefKind::(Closure,OpaqueTy)`. `DefPathData::ImplTraitAssocTy` is replaced with `DefPathData::TypeNS(kw::Empty)` because both correspond to `DefKind::AssocTy`. It's possible that introducing `(DefKind,DefPathData)::AssocOpaqueTy` instead could be a better solution, but that would be a much more invasive change. Const generic parameters introduced for effects are moved from `DefPathData::TypeNS` to `DefPathData::ValueNS`, because constants are values. `DefPathData` is no longer passed to `create_def` functions to avoid redundancy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #118188.
DefPathData::(ClosureExpr,ImplTrait)are renamed to matchDefKind::(Closure,OpaqueTy).DefPathData::ImplTraitAssocTyis replaced withDefPathData::TypeNS(kw::Empty)because both correspond toDefKind::AssocTy.It's possible that introducing
(DefKind,DefPathData)::AssocOpaqueTyinstead could be a better solution, but that would be a much more invasive change.Const generic parameters introduced for effects are moved from
DefPathData::TypeNStoDefPathData::ValueNS, because constants are values.DefPathDatais no longer passed tocreate_deffunctions to avoid redundancy.